b68cedc10c4f1d4da9aad42d51538fdcb9473607,applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java,WorkEffortServices,getWorkEffortEventsByPeriod,#DispatchContext#Map#,421

Before Change


        if (entityExprList == null) {
            entityExprList = getDefaultWorkEffortExprList(partyIds, facilityId, fixedAssetId, workEffortTypeId);
        }
        entityExprList.add(EntityCondition.makeCondition("estimatedCompletionDate", EntityOperator.GREATER_THAN_EQUAL_TO, startStamp));
        entityExprList.add(EntityCondition.makeCondition("estimatedStartDate", EntityOperator.LESS_THAN, endStamp));
        if (filterOutCanceledEvents.booleanValue()) {
            entityExprList.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "EVENT_CANCELLED"));

After Change


            entityExprList = getDefaultWorkEffortExprList(partyIds, facilityId, fixedAssetId, workEffortTypeId);
        }
        entityExprList.add(EntityCondition.makeCondition("estimatedStartDate", EntityOperator.LESS_THAN, endStamp));
        List<EntityCondition> completionExprList = UtilMisc.<EntityCondition>toList(EntityCondition.makeCondition("estimatedCompletionDate", EntityOperator.GREATER_THAN_EQUAL_TO, startStamp), EntityCondition.makeCondition("estimatedCompletionDate", EntityOperator.EQUALS, null));
        entityExprList.add(EntityCondition.makeCondition(completionExprList, EntityJoinOperator.OR));
        if (filterOutCanceledEvents.booleanValue()) {
            entityExprList.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "EVENT_CANCELLED"));
        }